Skip to content

Merge conflict#60

Merged
JohanMabille merged 4 commits intoQuantStack:mainfrom
SandrineP:merge_conflict_2
Dec 3, 2025
Merged

Merge conflict#60
JohanMabille merged 4 commits intoQuantStack:mainfrom
SandrineP:merge_conflict_2

Conversation

@SandrineP
Copy link
Collaborator

Adds merge with conflicts as well as the --abort and --continue flags.
Replace #57

@JohanMabille JohanMabille merged commit 72a2fc2 into QuantStack:main Dec 3, 2025
1 check passed
@SandrineP SandrineP deleted the merge_conflict_2 branch December 3, 2025 13:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants